From 8762791e826d69b3adff4ecf8a9177efc5fc80d1 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Thu, 2 May 2013 15:36:41 +0200 Subject: [PATCH] win32: Call windowing init from display_class_init() This follows the same reasoning as the X11 backend in commit 0122a9da8eab518652553aa4e777d5caf18a6163 --- gdk/win32/gdkdisplay-win32.c | 2 ++ gdk/win32/gdkdisplaymanager-win32.c | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c index 5d9cb14c60..6d17ace8c3 100644 --- a/gdk/win32/gdkdisplay-win32.c +++ b/gdk/win32/gdkdisplay-win32.c @@ -688,4 +688,6 @@ gdk_win32_display_class_init (GdkWin32DisplayClass *klass) display_class->convert_selection = _gdk_win32_display_convert_selection; display_class->text_property_to_utf8_list = _gdk_win32_display_text_property_to_utf8_list; display_class->utf8_to_string_target = _gdk_win32_display_utf8_to_string_target; + + _gdk_win32_windowing_init (); } diff --git a/gdk/win32/gdkdisplaymanager-win32.c b/gdk/win32/gdkdisplaymanager-win32.c index 0e5f71168c..9d1e234ce5 100644 --- a/gdk/win32/gdkdisplaymanager-win32.c +++ b/gdk/win32/gdkdisplaymanager-win32.c @@ -41,14 +41,6 @@ G_DEFINE_TYPE (GdkWin32DisplayManager, gdk_win32_display_manager, GDK_TYPE_DISPL static void gdk_win32_display_manager_init (GdkWin32DisplayManager *manager) { - static once = TRUE; - /* relies on displaymanager being a singleton , but our init functions - * call gtk_diplay_maanger_get() again */ - if (once) - { - once = FALSE; - _gdk_win32_windowing_init (); - } } static void -- 2.30.2